bitkeeper revision 1.1389.21.1 (4283792ffw1RN7kz5eMAmtk7CtBWnQ)

Merge firebug.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into firebug.cl.cam.ac.uk:/local/scratch/cl349/xen-unstable.bk-clean

diff --cc buildconfigs/mk.linux-2.4-xen0
Simple merge

diff --cc buildconfigs/mk.linux-2.4-xenU
Simple merge

diff --cc buildconfigs/mk.linux-2.6-xen0
index 4307b1ce3753cbc0acb358cb4dab467c7f03ee7d,f55cf1a99563694dcd8f7b52294ee8c21921cd52..cfba1824b00757d7ece01971a6aee07c4f2842f8
--- 1/buildconfigs/mk.linux-2.6-xen0
--- 2/buildconfigs/mk.linux-2.6-xen0
+++ b/buildconfigs/mk.linux-2.6-xen0
@@@ -32,9 -30,10 +30,10 @@@ $(LINUX_DIR)/include/linux/autoconf.h: 
          sed -e 's/^EXTRAVERSION.*/&-$(EXTRAVERSION)/' Makefile >Mk.tmp ; \
          rm -f Makefile ; mv Mk.tmp Makefile )
        # Re-use config from install dir if one exits else use default config
-       [ -r $(DESTDIR)/boot/config-$(FULLVERSION) ] && \
-         cp $(DESTDIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \
+       CONFIG_VERSION=$$(sed -ne 's/^EXTRAVERSION = //p' $(LINUX_DIR)/Makefile); \
+       [ -r $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION ] && \
+         cp $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION $(LINUX_DIR)/.config \
 -        || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig \
 +        || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig_$(TARGET_SUBARCH) \
                $(LINUX_DIR)/.config
        $(MAKE) -C $(LINUX_DIR) ARCH=xen oldconfig
  

diff --cc buildconfigs/mk.linux-2.6-xenU
index 84375b6d963b360d1edb5889bc7997eb8aa476d3,ac115ee372799d9a1052b8f0caaf101708ff3ddc..f2df01f9a7ca878cb274845c5d5565a1acac5fec
--- 1/buildconfigs/mk.linux-2.6-xenU
--- 2/buildconfigs/mk.linux-2.6-xenU
+++ b/buildconfigs/mk.linux-2.6-xenU
@@@ -32,9 -30,10 +30,10 @@@ $(LINUX_DIR)/include/linux/autoconf.h: 
          sed -e 's/^EXTRAVERSION.*/&-$(EXTRAVERSION)/' Makefile >Mk.tmp ; \
          rm -f Makefile ; mv Mk.tmp Makefile )
        # Re-use config from install dir if one exits else use default config
-       [ -r $(DESTDIR)/boot/config-$(FULLVERSION) ] && \
-         cp $(DESTDIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \
+       CONFIG_VERSION=$$(sed -ne 's/^EXTRAVERSION = //p' $(LINUX_DIR)/Makefile); \
+       [ -r $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION ] && \
+         cp $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION $(LINUX_DIR)/.config \
 -        || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig \
 +        || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig_$(TARGET_SUBARCH) \
                $(LINUX_DIR)/.config
        $(MAKE) -C $(LINUX_DIR) ARCH=xen oldconfig